Merge querypage-work2 branch from trunk. The most relevant changes are:

[lhc/web/wiklou.git] / includes / specials / SpecialListfiles.php

diff --git a/includes/specials/SpecialListfiles.php b/includes/specials/SpecialListfiles.php
index bbea46d..638d2de 100644 (file)
--- a/includes/specials/SpecialListfiles.php
+++ b/includes/specials/SpecialListfiles.php
@@ -101,7 +101,7 @@ class ImageListPager extends TablePager {
                $tables = array( 'image' );
                $fields = array_keys( $this->getFieldNames() );
                $fields[] = 'img_user';
-               $fields[array_search('thumb', $fields)] = 'img_name as thumb';
+               $fields[array_search('thumb', $fields)] = 'img_name AS thumb';
                $options = $join_conds = array();
 
                # Depends on $wgMiserMode
@@ -111,7 +111,7 @@ class ImageListPager extends TablePager {
                        # Need to rewrite this one
                        foreach ( $fields as &$field ) {
                                if ( $field == 'count' ) {
-                                       $field = 'COUNT(oi_archive_name) as count';
+                                       $field = 'COUNT(oi_archive_name) AS count';
                                }
                        }
                        unset( $field );